Merge changes Ic547e18b,I7b0f6b70 am: fe60632e06 am: 7866d76e4a am: 7ae47cbe44 am: 4943897fe1

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

Change-Id: I9cd5f4c56927fe1380f0d64a0ff769f2c4bbbd66