[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: f8ba311c -s ours am: c1afad78 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6019cee87c610b74c1c5a1f51144308da4845f1b