Merge "Fixed NPE problem in UiccCard" into udc-dev am: 897096aa am: a52d7ead

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/21600899



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