Merge changes Ibe63610f,I5d589d75 am: ee436e4f09

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

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