[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" into...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" into stage-aosp-master am: d39d129f -s ours am: fa676e63 -s ours am: 06cae644 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I639f3f5e58a021a53151d04495a244de9fcc8f80