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

Change-Id: Icec42228d71cfde746539dc7aa7d20f77699f639