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

[automerger skipped] Merge "Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 1f8d7763 -s ours am: bae4b28a -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd9c74a8bbcfdf31e87fca59da5aa6500ba8e742