Android 11.0.0 Release 22 (RQ1A.201205.011)
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 78bcfe5b90
am: 60cd73f453 -s ours
am skip reason: subject contains skip directive

Change-Id: Iefabd0b03ca12797cce14875a90ade3bde0b3398