[automerger skipped] Merge "Update responses for some IRadio 1.6 APIs" am:...

[automerger skipped] Merge "Update responses for some IRadio 1.6 APIs" am: 1aa9c075 am: e3aea786 -s ours am: 58ae4d4f -s ours am: 6abe0599 -s ours

am skip reason: Merged-In I9bee63861ee9825d0cec291a3206813a846f41c8 with SHA-1 f17eeeca is already in history

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

Change-Id: Ic625216db5dd9a003c768e183795260dbbbd767f