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

Change-Id: Ieadb8ce227e4fc0f99f3a90695fc90d72b6329e2