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

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

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



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