Merge changes Ie487b34e,I66efe42b am: ca5b1d7295 am: 6612680fe5

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

Change-Id: Ia6b33e78213934bf1ead84f8ccb5cb627e4d0f12