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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib27da53126ba1be8d7a2f13ca72cefb53b5fa30f