[conflict] Merge "Upgrade the version of IRadioNetwork to V2" am: 89417f14ef

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

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