Merge "Handle RIL errors properly" into udc-dev am: f17c4fb3 am: 302d0942

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



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