[automerger skipped] Merge "Migrate Connectivity modules to use modules-utils"...

[automerger skipped] Merge "Migrate Connectivity modules to use modules-utils" am: 09b947cd am: bd83c287 am: ff3492b4 am: 5a4b04ac am: 5335d96a -s ours

am skip reason: Merged-In I07260fec2c8ec4bee9ddc1ce6004622976182109 with SHA-1 b94bc99a is already in history

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

Change-Id: I3a690e83bde54e9204e700b34b0c97541133a543