[automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 38598d8d32 am: 8e4b6ba3c3

Change-Id: Ic5cb187f26df5fafcc3d94d625e58dc9c31cdddc
tree: a94a2a1854f485870138d479fb55ecdfe95c7675
  1. service/
  2. tests/