[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 skip reason: Change-Id I5c1c0f2642cc66716290b5943aad9c88ad91ba5c with SHA-1 cbe8c855 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic87cb4c9c5231c5f53d5f0b4c75458f886bfd97f