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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40657bd9e45469c3d0b16acef06d9b1ca48c812e