[automerger skipped] Merge "Merge history of frameworks/opt/net/wifi" into stage-aosp-master am: 07c142dd6c -s ours am: 09f3b68ad1 -s ours

am skip reason: Change-Id Idd663a60a09fa60cdb6aab58c3505f9344eb91c9 with SHA-1 6c5a49ea2e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c0f7b495f4d6f80f1b33901d4aed0ab7483ecdb