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

Change-Id: I9d337bab989b48d128e8dcdfed632cd990c3d631