[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 9c88e674 -s ours am: 2a75613d -s ours am: 0f3b30a0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8f7cff33d2bddcbe3393a8a3a1088579f2e58be0