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

Change-Id: I497b50ed19e38890884a3149b55101c31c092e1a