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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bd8407f7badaf17a33b8995159445fff1054a5d