Merge changes If8563c69,I48821970,Ic79479b6,I74b04185 am: b54eca9762 am: 63641e1cea am: 36ae5d0829 am: 5f9e96c468

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

Change-Id: I46171f23a7661f11973d33352e5749b4952954e4