[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 84fe9031 am: e543b21a -s ours am skip reason: subject contains skip directive Change-Id: I0098759c626dd34546835235cfbcdd2b84bd9068