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

Change-Id: I18ed44c85658bc46ed6075c283f53997ec3854c1