[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
am: 26f1b51bfb -s ours
am skip reason: subject contains skip directive

Change-Id: I2de4b01d878190166887d48488ef42c24a4ba65b