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

Change-Id: I6d8e5feba73f84a591b5563aa16d7c3c9cdac6ea