[automerger skipped] Merge "Prepares android.hardware.wifi@1.0-service" am:...

[automerger skipped] Merge "Prepares android.hardware.wifi@1.0-service" am: 1303d913 am: 5cd48bab am: b9f3b622 am: ebaa020b -s ours

am skip reason: Merged-In I5827ed1ceb9be8278a54fd828249bf8e549fb950 with SHA-1 80af4e44 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1908491

Change-Id: I9353c57eea4a4e13176de1a9a2d249e0c189a78d