[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 0172a23b1a -s ours
am skip reason: subject contains skip directive
Change-Id: Iaebf94c5293effd4087eb0440c39f2b1a74e0b02
This commit is contained in: