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

Change-Id: I1163106444a48cf93315806225458200100ca079