Merge changes Ieb537412,I2339a8e0 am: a7e51752c2 am: 5ada8b386e am: fbe52e4cf2

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

Change-Id: I2ef90488b9ed41d8b61fcb52d0c20b81ef46baff