Merge "Revert^2 "Update getRadioInterfaceCapabilities return type"" am: 8abe8c71ef

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fb69ad81fee9e2544590c3fb9464351dc0bff97