Merge "Do not crash SubscriptionManager clients" into udc-dev am: 5487f903 am: 9bd6d26f

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



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