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

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

Change-Id: I0a13ebf9584e74caffee205926d1716e1aac7c9e