Merge changes If0e5861e,Ib385b24d am: 488d8f2060 am: b2da79c8de

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

Change-Id: Ibf8cd5b410535711c1f3842b02dedc7826843488