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

Change-Id: I1bb231ad6290efa709731547bb1452511578f364