[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: subject contains skip directive

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

Change-Id: Iaa91cd3de0cc1bba0544d9f95f1f2f9e2723871e