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

[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 34b01ce3 -s ours am: d0aafafd -s ours am: d939cffe -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idbb06087a4b2c7349d92bac843653c83d4bf8137