[automerger skipped] Merge SP1A.211205.008 am: 96dccee28a am: cad26795d1 -s ours am: 345de7f775 -s ours

am skip reason: Merged-In Ie8480c46c91ffa756edb2c85fc565d2e1d1504a5 with SHA-1 f87b20864d is already in history

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

Change-Id: Id5af58049f7e3b01cc39be9b1e9ded9b36ecb075
tree: ef66970e1034d76069c3f17ac2e0f357a7f633ef
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS