[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: 958a70d3 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d682e44faf60e9ce99f47a08f49a37f27066ccb