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

Change-Id: I807840887447907182d1447d8d8b6de96d8316d4