Merge changes Ie04465ce,I29bbbd27 am: 78a58c8af4 am: 1113ac8ad5

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

Change-Id: Ie4cd767535db99e8dadeed08f3cf3736b69fb8ca