[conflict] Merge "Revert "Radio HAL : Support N3IWF"" am: eab578f9

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



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