[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 4e12559f3b
am: 57fadf1b76 -s ours
am skip reason: subject contains skip directive

Change-Id: I5e40a356ff583a93d317a3dff40598712841a4b8