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

Change-Id: I2376db748a97dadabd502ee27ff5318586d054a8