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

Change-Id: I8f6f568527966d8bac32679eb03345796fa7d85a