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

Change-Id: I53c3846726880b65d3fe317d458c6a8160b3cea4