Merge "Add combined provider class that manages new settings UI" into udc-dev...

Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd5 am: b31c4909 am: ce50f131

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585



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