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

Change-Id: I462eb2a4d29a532580d6a7c84c8b4ed99b0eba7d