Merge changes I097784a4,I6a5dcbb1,Ic52adef0,I5cc00deb am: 3caff151fe am: 3f711658f0 am: 24cad710dc

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

Change-Id: I261f1cc743b040a5bb4ab2c6509a867911a4413e