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

Change-Id: I385947cc7ea0754b956d9e4ea7cc2f8b4f380440