Merge changes Ibe63610f,I5d589d75 am: ee436e4f09 am: a3133ee119 am: 84b301bb10

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

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