Merge "Partially refactor Tethering to new network callback APIs" into nyc-dev am: 01a235b
am: c965c05

* commit 'c965c057fce615f8212401987c6fb4fc88d6fb18':
  Partially refactor Tethering to new network callback APIs

Change-Id: Ibd24f2003820053cf3ed2fc7ea11f556b087ea1a