[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: ca4c520f19 -s ours
am: 9829d71c10

Change-Id: Ic8ef53936a2a91dc915a5e5d967ef72be50ad15c