Merge "android.hardware.wifi@1.0-service in soong"