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

am skip reason: subject contains skip directive

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

Change-Id: I40221d3c6b01df66de2fed291d60f8e3d8aa0683