[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 71a8105b am: 7d706b18 -s ours am skip reason: subject contains skip directive Change-Id: Id96d45a637b38f8d786aca13231d5bcb5e870a26