[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 26e3982a68
am: 556bc3cdfa -s ours
am skip reason: subject contains skip directive

Change-Id: I43bfb4bfeb88d880908af2d8a3e3476674dd5529