[automerger skipped] Merge "Merge history of frameworks/opt/net/wifi" into mainline-prod am: c79e1e6bac -s ours

am skip reason: Change-Id I6610b2ea3395a62311894489196ef0cdc8e14afd with SHA-1 cab1f945a4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/13272938

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b59842312caef445688237954a4d577aa574f5e