[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 54cc4ca1be am: 1537e27bdc -s ours am skip reason: subject contains skip directive Change-Id: Id9fe10bed370d83cc05c100e2c9f63680fb5aad9