[automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: de0c1e355d am: 1833210c06 am: 8f6000cabe skipped: 70804d7355 am: f5c7003389

Change-Id: I999734a7465913cfa13c0b6d24e463ceabac2af4
tree: 1bfb5ebeab4aef5f00280e00503993d4a8d2e744
  1. service/
  2. tests/