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

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

Change-Id: Iddce5528f0543e96a63e1a720d61a5127b72ef33