[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: 5db75b67 -s ours am: dd554702 -s ours

am skip reason: Merged-In I867df303b8da1b9748e5a775dd8bf4a1b910c434 with SHA-1 73586845 is already in history

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

Change-Id: I6001e7b161076adab8ab04276d460e47978a1fd9