[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 2dcac1e2a1 am: c10c4e8f3e -s ours am: e0fc7fdc88 -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: Ie2530058337fb3d62890ee3c671dc8f123d7ea8f