[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 3638874ef7 -s ours
am: 44201c6f24

Change-Id: I7e52cd11a01b77fd3c17a2cd66528f66568e39e5