Merge "Only apply tcp buffer sizes for default net" am: dfdaa016bf

Original change: undetermined

Change-Id: I7e083b7050127e47144d5d98bf4a95df82c5b260