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

Change-Id: If14d0122de7000a12361e93734835a64c91c1f25