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

Change-Id: Ia2e949d8d0e7c4e7fb5591ab97b3276e7fb3ab36