Android mainline 11.0.0 release 17
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 5dd29168be
am: 6037a9bba2 -s ours
am skip reason: subject contains skip directive

Change-Id: I3b642a1493f0102f72802ff146bcfad2d402d58a