[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 skip reason: Merged-In Idc989ac84777589b4bdd72012833cdbdab7e872c with SHA-1 58cd8bc2 is already in history

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

Change-Id: I2f88914f49ea0b981073fbaaf4c252d491633497