Merge "Allow mocking permission in TetheringServiceTest"