[automerger skipped] Merge "[Clean up] Create a new packages for class BroadcastProviderManager and DiscoveryProviderManager" into tm-mainline-prod am: 9204d61c48 -s ours

am skip reason: Merged-In Iff4eddf8085878e5df19d36132d415f7a8f7e55a with SHA-1 3e0dad88e4 is already in history

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

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