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

Change-Id: I3db70a7d69c2d63412ca0767cea383a0e8181066