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

Change-Id: I02c72c08ff526205abb7c7f5fa076a04781e46c7