[automerger skipped] Merge Android 12 QPR1 am: b3bdce4aa7 -s ours am: 9ec3f1efbf -s ours am: 713fcbb7a3 -s ours am: 7f4f1cd67c -s ours

am skip reason: Merged-In Iac4194fe385a55c888040f159a89fc787cbe06d5 with SHA-1 e6477d04c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/1921973

Change-Id: I88fdb6b065e5b8bf4f8f97a0fb196c66a4644625