[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 4aaa1dea8b -s ours
am: 2be3835806

Change-Id: Ib44dbcc7eb74efa2b7b8cbbb9d1781f355947445