Merge "Do not crash SubscriptionManager clients" into udc-dev am: 5487f903 am: 8c237c36

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



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