Merge "Revert "Update getRadioInterfaceCapabilities return type"" am: 21e17b45a5 am: 81a933bb19

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic11c35596aa3930bde81c5cb3df87524bd8cf237