Merge changes Ic9b9cef4,I5e807b64 am: 9779dd4a6a

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

Change-Id: Id51bd25eab7c06272bf856a0c0b54f6feb67d4db