Merge "Fix error response handling for RIL request" am: d15d4e41a8 am: 2058e9356b

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1374156

Change-Id: I99e2230e50e4ace3a5fd82a852f5045ea310ed25