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

Change-Id: I8cfc0d65ebe07ca52903e6f7a3570408394e5ad4