Android U Beta 1 GPL
[automerger skipped] Merge TQ1A.230205.002 am: dd999399bb -s ours

am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 f43bf30ead is already in history

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

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