[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: 9cd06921 -s ours am: d9db7235 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id944250f9785cbc6355d7d355157cb439ea5142e