Merge "Prepares android.hardware.wifi@1.0-service" am: 1303d913f3 am: 5cd48bab29 am: b9f3b6228e

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

Change-Id: I80753e5975880530b3999bb03c5b262c095e36e2