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

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

Change-Id: I22b88e3d48b743de5f66669245092c91109435f2