Merge changes from topic "radio-hal-2.3" into main am: 1251ed7d80

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

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