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

Change-Id: Id03a7f7b60661a936f873c223e30c074a4b21cbf