[automerger skipped] [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: de0c1e355d am: 1833210c06 am: 8f6000cabe skipped: 70804d7355 am: f5c7003389 am: bc9e6b9fb9 am: ba11c2db8a am: f3fee11f20 skipped: edf009832f am: 6aef93377d am: 8e0cb132f8
am: 7596ca1510  -s ours

Change-Id: I1bbca449e138da1da0e6bcb63e161c452df46955