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

Change-Id: Ic9888fc7229d77ba721572a4eb49e7b56a2bace8