Merge changes Ide638de1,I11bc5cc6 am: 0793bb709a am: b737c9e096 am: 11ea0f2eeb

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

Change-Id: I6ebe4cb1a955f13f86b615465c8bdebd1e6b4202