Merge changes from topic "presubmit-am-b4215ed109244773b8cc634613776196" into udc-dev

* changes:
  [automerged blank] [Clean up] Create a new packages for class BroadcastProviderManager and 2p: 94251eab12
  [Clean up] Create a new packages for class BroadcastProviderManager and DiscoveryProviderManager