Android mainline 11.0.0 release 4
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 335a562129
am: 9689100683 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd03192a4e924d469719377940b5e19c8cdc6b9a