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

Change-Id: Ic804d9fc2327f7055cdb8fa5585ab1dcce0d98f9