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

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

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