[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 4174bca27c
am: e8ce947949 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibdf5d17e5a50cdb3904dd1d153bd4cf11a4f7b64