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

Change-Id: Ibededdd5b3b1a7aff3f1d6292e13dfa61f90024e