[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 5487e82df5 -s ours
am: 4117bb8201

Change-Id: I7957f27fb7ab5f4e6c3fb5b8c18ccd731ed6a991