Merge "Attempt to reload providers when selected provider is available but unloaded" into udc-qpr-dev am: 8b5ef0b19f am: a803fdee60

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

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