[automerger skipped] DO NOT MERGE - Merge Android 13 am: 5120c04b23 -s ours am: 1ffc31cc3f -s ours am: 8fc91008ef -s ours

am skip reason: Merged-In I972a9b84667c8527209c8983f454d8511acc004e with SHA-1 96739d9bc2 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/iw/+/2186706

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