Merge "Allow mocking permission in TetheringServiceTest" am: ec48bb82aa am: 4abe3f8db3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731231

Change-Id: Ic54d721af3ea589f3383cfe9c6dfb32928ba80ac