Update to ConnectivityService to use utils am: 4ab1ffca29 am: 241bbaddf3

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

Change-Id: I5cdadfa7d589e63013baf752d1dc752dfc9c3cc2