Merge "wifi-services-srcs: JarJar IpConfiguration"