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

Change-Id: Ib53a57abc1fdf5370cb197f9065f033cee0c86ab