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

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

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