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

Change-Id: Id065829f752e0c25fb4e6f4d4a34c0f4661db0d7