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

Change-Id: I3c0e4763b6eb841b59e16bbab88e586e0fd6e774