Merge changes If8563c69,I48821970,Ic79479b6,I74b04185 am: b54eca9762 am: 63641e1cea

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

Change-Id: I74bc54b9f40d60353b6bec7a95e5ebf3d00320ac