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

Change-Id: Ia50bb30c8b968deb5ce69a07a29b86e0635c50d6