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

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



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