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

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

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