Merge "Fix error response handling for RIL request" am: d15d4e41a8 am: 2058e9356b am: fcdec2c17f am: 8c40d68ff9 am: 0fdb2873d7

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

Change-Id: I131e65bc99749f3ff6502f32970058b26fc4a37d