Merge "Disable provider if removed from primary" into udc-dev am: ee54d713

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



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