[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 2d0968363c -s ours
am: 3ab4edf383

Change-Id: If72aabaaed3c228aa18a890c5d2249e82027aae1