[automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: de0c1e355d am: 1833210c06

Change-Id: Ib2384cf8e636ca4172faac0b20f38dd39e63c0a3
tree: 9bd16b4d0bf591c323bde12bbb45d89caa6aa0a8
  1. service/