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

[automerger skipped] Merge "Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 9e99535b -s ours am: 7feb02d9 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I307b6ee3cc56b1c635690c59bd1d8d1a08f924b5