Merge "Add TetheringServiceTest unitest" am: 507e5f09 am: 028ec487 am: a25d204f am: fd6d8035 Change-Id: I0d8afb5ffcba84116295c8adfe98ac638f9312e3