[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: f823015730
am: c7b3762aaf -s ours
am skip reason: subject contains skip directive

Change-Id: Ie4f02bd33fe95723457f603a44ed95235c07657e