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

Change-Id: Ifbfb80b507277de69115e8ee0e2d1999e614a17f