Merge "Do a null check before returning the primary providers" into udc-dev...

Merge "Do a null check before returning the primary providers" into udc-dev am: cc87e369 am: 5c789847 am: 8beb63ad am: 10628ffa

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



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