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

Change-Id: Ib23f2e2a893f874394751c1baa46ea14177aeff9