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

Change-Id: I4bc047e8935ea822c84449e1d552dd3bcb33089d