[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 56cff2ce -s ours am: 4c4d27cd -s ours am: 3e8c3dba -s ours

am skip reason: subject contains skip directive

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

Change-Id: I99ea76c7c597a60491aa0921ed41cc3512e2ec9b