[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: d943c453 am: 2b5630f8 -s ours am: b351365a -s ours am: 4cc4892b -s ours

am skip reason: Merged-In Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 ed2ff0f5 is already in history

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

Change-Id: I4c8946f4eb7660c80eeef287d71994d2d74315d9