Merge changes I4a2e97a0,I11248f6b am: fea6523ac1

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

Change-Id: Ib5ba596f285341edcf0ca47a710fbc0914513c37