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

Change-Id: I1a32cee69d0edcb92d81a4bb8e6f98912d86a735