Merge changes Idce05e13,Ie9920192 am: 37f927d0bd

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

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