Merge changes Ic547e18b,I7b0f6b70 am: fe60632e06 am: 7866d76e4a

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

Change-Id: I32f813e97650b8a2980746b8d7358e878a480242