Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b
am: c5f2edcb4c
am: 09b2df4303
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585 Change-Id: I750dc699264f522512cf8ecf41b2be97bb12a4d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: