[automerger skipped] Merge "Use AIDL Radio HAL." am: 5f403d31d2 -s ours

am skip reason: Merged-In Ic1512611da14d32e2eddbbc205d156d64652c7ef with SHA-1 379e30e869 is already in history

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/2178214

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