Merge "Merge "Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev am: 21e331ed" into pi-dev-plus-aosp am: 3692e812"