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

Change-Id: I3019d744d23f007446580ec24aaaed60611104a9