Merge "Import utility class directly from the connectivity project" into main...

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

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



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