Merge "Remove ConnectivityServiceTest signature perms use" am: 54c7434f0d am: 96ad425c5e

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

Change-Id: I1e264659c1cd6d88a669524af8ceacb5c6c05105