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

Change-Id: I406bf89a1f0e1677b2b1d49b02d4956647ca02fd