[automerger skipped] Merge "Merge Android 12" am: 732fbbcf -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 732fbbcf -s ours am: 422f38ce -s ours am: 0c05837b -s ours

am skip reason: Merged-In I44a0f5ab28aefd2a8c9f98dbfbc682a91dbcbbba with SHA-1 b7fdde4e is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1847693

Change-Id: Idf1e0268afd484a5251d562e104b4eb6cd7a3d47