Merge "Allow P2P CSA from 5GHz to 2.4GHz band" into tm-qpr-dev am: 6f3aa559f8 am: 0ec40660c9

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/19347221

Change-Id: I3b0ffd3c3646e7f875e25a5f8d9a694f69214e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>