[automerger skipped] Merge "Update getRadioInterfaceCapabilities return type" am: 040cad12fc am: d86d830277 am: cb09dcd097 -s ours am: bb4a111e1e -s ours

am skip reason: Change-Id I137388287d102fb9ba6893ef286a4249efbc63d5 with SHA-1 95a4c1fc80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e32e99dc1b135c9a7cbb5255c045bbed22f50e8