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