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

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

Change-Id: I3d87c6aeffd89ae50427ec0cd258d416fa746d37