Merge changes Ie9fa8c9c,I9773a4cf am: ece7023082 am: ce20f7fa15

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

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