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

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

Change-Id: Id0979fd5d2c4d6072ae13d967b1f5acffef8b06f