Merge changes Ic9b9cef4,I5e807b64 am: 9779dd4a6a am: 5d3c096ffd

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

Change-Id: Iad9986933d78ab2c93c2e6d541e4d626b1e11f34