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

Change-Id: I77b4eefdac2df8e57a9bfaba36b66a36ad29dae8