[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: d943c45349 am: 2b5630f86c -s ours am: b351365a44 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7e6d75cfaf22f5addfeb41afdc9d943646a5be3b