Merge "Fix more AIDL warnings in Radio HAL and lock it up" into main am: 0bd3d52ca5

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3363935

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