[automerger skipped] Merge 10952656 am: f52d60ff05 -s ours

am skip reason: Merged-In Ib01782caca1aae4fe4cf9f251db65a6f995fe194 with SHA-1 b0283abffe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/25091141

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