Merge "Prepares android.hardware.wifi@1.0-service"