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: I634aca925b30b6b15c5b786d7b03db57eadbde36