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