Merge "Skip provider switching dialog when app sets a preferred default." into...

Merge "Skip provider switching dialog when app sets a preferred default." into udc-dev am: 1ef0489d am: 084406e7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22690094



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