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

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



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