Merge "wifi: Fix for DPP VTS test failures on 5GHz only devices" into stage-aosp-rvc-ts-dev am: 80224805c5 am: 4b47ecaf5d am: bdc16cba32

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

Change-Id: Ifbfbd25c1cd1b1b5d99ee8d4a3b2b0501d906f3f