[conflict] Merge "Radio HAL : Support N3IWF" am: f71279a2ab

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

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