tree ff6e9c9179eb482326d49aa57cdc5be7a6808584
parent 679fc544657976d2eccd65aa5b2a1ce2e7cc5d9b
parent 67f86b6f33f44aa395c7330c7066155ec43e9e8b
author Daniel Bright <dbright@google.com> 1614313026 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614313026 +0000

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