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

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



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