Merge "Add TetheringServiceTest unitest" am: 7e0920903b

Change-Id: Ibc3a9a68df3400017fd8fc24af53e9c01708b11b