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

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



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