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

Change-Id: Icc05010637db5006fffd4d946aae3b0d16bd6831