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: c5f2edcb

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



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