[automerger skipped] Merge "Revert "Update getRadioInterfaceCapabilities return type"" am: 21e17b45a5 am: 81a933bb19 am: da75193755 -s ours

am skip reason: skipped by user vmarko

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4017c4a4b99354e835f721d576386dff180b60f0