Merge changes Idce05e13,Ie9920192 am: 37f927d0bd am: 5d31552866

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

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