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

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

Change-Id: Iedd74f9d769ce313c9c1190b0a8930dc470e7a3c