[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: 4c704ae3ac
am: 7182bed81a -s ours
am skip reason: subject contains skip directive

Change-Id: I34653ea0d5098ffbdd9624c38f2244556f7f4ead