Android mainline 11.0.0 release 3
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 6bf3c94558
am: 62a6e52515 -s ours
am skip reason: subject contains skip directive

Change-Id: I98dc15debec7844b7b6550010980765e336b21d7