[automerger skipped] [WifiLock] Move arg validity check earlier - prevent service crash am: 400ea7d562
am: ece5af41f0 -s ours
am skip reason: change_id Ic7c3f59524aa6a0e2aa41b34dd8179b31dba84e3 with SHA1 031d7dc938 is in history

Change-Id: I57e439956985e63febd9c73b70ad290ea6ff01ed
tree: 7f144f24c98f966fccb66cde4f7aaa75e01480be
  1. service/
  2. PREUPLOAD.cfg