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

Change-Id: I6271d7877ea68ceadf37e4ceba69ec2679ca63bd