Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9 am: 6ca4626803

Change-Id: I86c09957155e04603dd5d23e95a571b4e53c8f37