Merge "Add default value for TCP buffers" into tm-dev am: 54319ed2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284243



Change-Id: Idd4320d0449e1229a85b3d109d8a86514ea0109e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>