[automerger skipped] Merge Android 14 am: 299f2ecf1d -s ours am: da35222766 -s ours

am skip reason: Merged-In I22b1d636f2c5209c9bc996d758331a43c3b8133a with SHA-1 8551d6a0d7 is already in history

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

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