Merge changes I7a307698,Id11e1b95 am: 6b7710c3ab am: 466ca7afd9 am: 7a490ba293 am: ac5ebf6e10 am: 11436ad042

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

Change-Id: Id28ce60ab1ffa1eaaaea1282eaeb38e38d73cbb3