[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 5fa242958e am: 9ff59edd68 -s ours
am skip reason: subject contains skip directive

Change-Id: I1e316bf1ced28b8b71ab05ab0896f49d549ab269