DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master

Bug: 134405016
Change-Id: Ib0fd61f1ab8408ae8b25f9b454199bc57b23abca