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

Change-Id: I68b54e79ee8993cf33a8e4fda2aae090f0f41bb7