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

Change-Id: I8d76a8e22b1035c8dbac6eef7d4d9935b909c796