[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: dc87a07954 -s ours

am skip reason: Merged-In If550b000a40608832d42dac4f3010db87e3800bc with SHA-1 3dec16bf85 is already in history

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

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