[automerger skipped] Merge "Merge RQ2A.210305.007 into stage." into...

[automerger skipped] Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master am: 8c993595 -s ours am: 6725c98e -s ours

am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I093ad671768d6020662496dbfc866cab6ba384cb