Merge "[Clean up] Create a new packages for class BroadcastProviderManager and 2p: e8ac933b9c" into udc-dev