Android 11.0.0 Release 18 (RQ1A.201205.003)
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 65450e5be4
am: 0d22775e99 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifbf421ee8a3e07f760e3311b36b67750fff2e21b