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

Change-Id: I343476217fdebeb24ef58bf3c2941788a86e71b8