[automerger skipped] Merge TQ2A.230405.003 am: 95e84836cd am: 7d2bc2409d -s ours

am skip reason: Merged-In Ifc12240165e7108210b8a5f630eb737a185acad2 with SHA-1 0377242f71 is already in history

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

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