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

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

Change-Id: I0a84ddfb734fb647e197f44b875893c418898ac8