Merge changes Id9a9451a,Idf113709 am: 03a24f50cc am: 0e751cd213 am: f47925ad3e

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

Change-Id: I483cfc93af04830ff50dfec5bfadf71c7578fd90