[automerger skipped] Merge "Add interface for radio service user controller"...

[automerger skipped] Merge "Add interface for radio service user controller" into main am: f4b27d13 am: 11541683 -s ours

am skip reason: Merged-In I1c05ff684bc969c704cb1531ee1c7efb84465003 with SHA-1 7f30249a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3265823



Change-Id: I44771707cdc3053cfa3cace559a5248b23e12af4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>