Merge changes I89e4de2e,I673d7a4c,Icfb454c2,I5924a82c am: a54c861843 am: d612489ad4 am: dcaed9ba8e am: bbf48d74a2 am: d355e3922a

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

Change-Id: I98a59db3c256d1579b4f591832879bf989016ddf