[automerger skipped] Merge Android U (ab/10368041) am: 28a7201c28 -s ours am: 3bf43ade08 -s ours

am skip reason: Merged-In Ic4f25f3aa96ff5dcba107485ed33c5d5626fc362 with SHA-1 a1847040d4 is already in history

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

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