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

Change-Id: I4f76f716c39a19e12ee6f94881ddd1d8e13c9b0d