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

Change-Id: Id7a04a62d847268eed76825700cd78728b5a3ca3