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