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

Change-Id: I62f2194c6eb223eae5dba4e89c4cd5650a631229