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

Change-Id: Ib525c89073d451ee28591d0111fffa1adfe6b5a7