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

Change-Id: Ibd3706947c652a3ded7635f80e846501da50d4ee