[automerger skipped] DO NOT MERGE - Merge Android 13 am: 00f9ddd8f9 -s ours am: 011cfc6839 -s ours am: e59c23b79f -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: Ia0442738caa261d3860a1fbcccdcadf6fa34928f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>