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