Merge "Call netd to update the tcp buffer size" am: 51b1e458de
am: 7abbfaddab

Change-Id: Ib7ab6171d6bc15b2ab8e874eeaafe79f0b8cc4b5