Merge "Do not throw InvalidArgumentException." into udc-qpr-dev am: f45953e9 am: 38d5c2fd

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



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