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

Change-Id: I2feabfe0834d981ec3c84cbe0ecff9682c6a5031