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

Change-Id: I6f6482af0bc76e0006aabb08eb3f514588e3c390