[automerger skipped] Merge "Merge RQ2A.210305.007" am: e6169101 -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: e6169101 -s ours am: 9e2b0c46 -s ours am: 6d118fa7 -s ours

am skip reason: Change-Id I2f7cee6cdae4b16c5adeb7af751a591a939948e2 with SHA-1 e00110e1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87c8b8c2bf03914e20da4bf917f563a2e32f3865