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

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

Change-Id: I96d3c0a68c6c090be38a3d371bf54af82dbb0aa6