Merge "Add TetheringServiceTest unitest" am: 507e5f0959

Change-Id: Ibc3a9a68df3400017fd8fc24af53e9c01708b11b