[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: e92f785c7c -s ours am: bc1767d387
am: 84f007cd6e

Change-Id: I8630b39c283be24b2eb01981bddba3a5c61dc04d