[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: ff62169b99 -s ours am: 41e45a0c28
am: 9575f3f50a

Change-Id: Ic4dfb1d60c0c35b07bce411f23a1fe13227225b4