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

Change-Id: Idc0dde05c9263cf70945e75e5b1a753c97f85874