[automerger skipped] Merge "Revert^2 "Update getRadioInterfaceCapabilities return type"" am: 8abe8c71ef am: 67f86b6f33 am: 40c471d712 -s ours am: 5f1a247004 -s ours

am skip reason: Change-Id I137388287d102fb9ba6893ef286a4249efbc63d5 with SHA-1 95a4c1fc80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I021a1281fa8c417baf873767a920efc6aea97aa8