[automerger skipped] Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6
am: 167ba43c34
-s ours
am skip reason: Merged-In I404444115f178faf5545dec9686096fcdfdf73de with SHA-1 b69351b06d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959
Change-Id: I6748ff3f2cb180aae4135104f5111464e9744fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: