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

Change-Id: I13be2168c9a81288713e1d010d54de24d0aac3e8