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

Change-Id: I0edbfa7760e350471734028f7633e6b122c9acf1