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

Change-Id: Ie6c4b0e65be92dcb7af02086a32670d13ec0b7a6