[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: b3ab298b -s ours am: 904c7f4d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia28f3f43e3517f9985bce6d7153635f2e904f2c5