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

Change-Id: I6ff2fea77d5803aad99af129cee1ec7b92f14561