Merge changes Ieb537412,I2339a8e0 am: a7e51752c2

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

Change-Id: I9be6f588f1eafaea21aee948061c6a75433969db