Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use""