[automerger skipped] Merge changes I4a2e97a0,I11248f6b am: fea6523ac1 am: 740ac48ffb am: 273cfc2459 -s ours

am skip reason: Merged-In I4a2e97a033d1faece97600d3188c81e094a02c21 with SHA-1 431d921818 is already in history

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

Change-Id: Ic56d33a2f6ab4a2235595549ecc1f9e20386be38