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

Change-Id: I3982dd8c2021c5927796ac81f1bce3f68ed010d7