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

Change-Id: Ie07ff1b37df9470335fe651b6a4f4fb22df118dc