[automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: 8e9e1764 -s ours

am skip reason: Change-Id I698888f26ebb4df07b9d63839ffa055c7b5f1609 with SHA-1 9c50c79b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4732803a059593bb806931f5049cf23ce9d7459e