[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 334b9905b2 am: 4b4e6198d4 -s ours am skip reason: subject contains skip directive Change-Id: I62cba1094144b252cc5c8265acea5038ddc11400