Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev