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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99669e9f9f59c317bb8adfdde24e3ef49a938371