Merge changes I4a2e97a0,I11248f6b am: fea6523ac1 am: 740ac48ffb

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

Change-Id: I75326fabc38b65456e0922a2b7692e70339fbb67