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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab297d9ca4835281e55702d5a0d0c209508f952d