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

[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: e412ab4e -s ours am: ed379ba1 -s ours

am skip reason: Change-Id Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d with SHA-1 ce1b075b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fafdadf12afda55b4e8e188875f96ee5194a1fc