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

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

Change-Id: I74c6645d0d59de5ed7e61d753a379ff778817828