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

Change-Id: I9ba5c7f43dbd9cc7952b9f4e2bc430932a455100