[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: e4b09fd3 am: 511b12a0 -s ours am: acb77301 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f8224c4b836362a39caa01b671582f5e656d6ef