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

Change-Id: I385fe6e234373a8f04ba3204bea24e49a092fb6a