Merge changes If0e5861e,Ib385b24d am: 488d8f2060

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

Change-Id: Iea74610f3437640b40ea716bfc9b52d8b466bb45