Merge "Import utility class directly from the connectivity project" into main am: 545573aa8a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3157559

Change-Id: Ib205c0d7ef176ba63bec35bb4832eb2ac56e5222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>