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: 0988d202

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



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