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

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

Change-Id: I278b6ed1d886f848e0fcf8ddabc39e51a7a7ed9a