Merge "Apply API review to android.net.Network:"