[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 8a2edf737c -s ours
am: b9435341b5

Change-Id: I3a0630d657ae3cea7945b2ea6f95a43391998b3d