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

Change-Id: Ib68859d15f126ff660d52d7433cc74f7ff088940