Merge "wifi: Fix for returning wrong radio combinations matrix" into tm-dev am: b51d11fb

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



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