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

Change-Id: I5dda3f9b876bb285428c92a84a40e7e1dc0d3a17