Merge changes Ibe63610f,I5d589d75 am: ee436e4f09 am: a3133ee119

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2288496

Change-Id: I6286550719cccd35fc76f3de81215a47f5275797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>