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: I9c68c36821677c2ae0e83a2674e835a53da72212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>