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

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

Change-Id: Id65b32494bd318f96d1b7de5dabc2eba132a01cc