Merge changes Ic547e18b,I7b0f6b70 am: fe60632e06

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

Change-Id: Ia34db089603e9d4ceb23d101ae7438bf794abdc6