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

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

Change-Id: Idaed9c53ac439b95b6f4ded8d65e408bc6cb5a0b