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

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 7cd13c5e -s ours am: 7c0a5a6e -s ours

am skip reason: Merged-In I5936ef6efe3542370383128c5e919a04b52ab7aa with SHA-1 75acf0f8 is already in history

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

Change-Id: Id26097246ccd5b3635930fb194748a2d1522cf60