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

[automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: e4b09fd3 am: 511b12a0 -s ours

am skip reason: Change-Id I034d45f1afcdd07c0b12e2db7e4134b695ec5c70 with SHA-1 ca6272cf is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34bd275db0a8ba59f9443d29e600f0e09384965c