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: 922216b0b0
am: 17f7086ed2 -s ours
am skip reason: subject contains skip directive

Change-Id: I49ee07d8ca006658722402e5b2b9fe3a8d688d37