**This is a merge to master from udc-dev** As part of the spec'd design we should merge providers by package name this means that if there are multiple providers they will be all turned on/off together. Bug: 266772233 Test: make & atest Change-Id: Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928