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

Change-Id: Ied09661b1e5a72af6b246ab9b4531c9c2a3c84af