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

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

Change-Id: I58b559364e9bd28efcd1bb473350bda45a9ea8c0