Merge changes I1d3e5e66,I86b869af,Iab4d3902,I645ee722 am: 72864d2930 am: 968582e45f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461087

Change-Id: Ice6233ff1de7e7e3112c4f4ba6f01c02468ab5bd