Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 2dcac1e2a1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c3638aad7320dfc31798963ca7101c675212c3a