Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: e4b09fd3dd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3c3112de6c6b91e7f5abb80c948dbe8db8c9195