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

Change-Id: Ic32c2fcd2d8bd4d820fcf8c39396fc09a61d0764