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

Change-Id: If1d8ae689a671b9270aa68785d4982799855332b