Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use"" am: b9d05685fc am: 80b28dec8c am: 972b65d492 am: 1a328dc5b5

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

Change-Id: If31927407437698a0e679bf1fc92f6f21fca13f3