[automerger skipped] Merge changes I4a2e97a0,I11248f6b am: fea6523a am:...

[automerger skipped] Merge changes I4a2e97a0,I11248f6b am: fea6523a am: 740ac48f am: 273cfc24 -s ours am: 81a16426 -s ours

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

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

Change-Id: I1116d566043a3a79f4c84ccc4bc40ba54b72a5be