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

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

Change-Id: I7a803c2c7570bd4eeef70ecf8dfacf951e76d3a1