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: ec88ba02 am: 0e0b31af am: 04e8f88b

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



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