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

Change-Id: I3bd6fc2dd9fff0beb512a967d0aee7b66fed6c76