Merge "[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0172a23b -s ours am: f56a5296" into qt-r1-dev-plus-aosp