Merge "wifi: Fix for DPP VTS test failures on 5GHz only devices" into stage-aosp-rvc-ts-dev am: 80224805 am: 4b47ecaf am: 05bd55e2 am: 4fd430c6 am: 1d852f13

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

Change-Id: Ica6439099b14df87a678b9e375042a501a1fe0ef