Merge cherrypicks of ['googleplex-android-review.googlesource.com/24055013'] into udc-release. am: c218a2d74c

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

Change-Id: I50c1987ab802c7fc734377fc30a5f9e4b96a55a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 870e2b7b4fe8745b72664bb31d7978ce322af3ff
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. 7/
  5. current/
  6. OWNERS