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

Change-Id: I5b299ae00ec8f179942770e28864c58d01074311