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

Change-Id: I5fb1b0efa7dca61b4a5bc200ac793dc8763b85b1