[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 56cff2cee0 -s ours am: 4c4d27cd19 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie76a9907b58b4336af680c50a698682830d3b5fc