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

Change-Id: I810f017c789a6f9e1e989dbb6e704763fb84ee39