Merge "Used single TCP configuration for devices" am: 71649aa3f4 am: 5c11d472e2

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

Change-Id: I985f13cd424b0baf8d31fe9236a6be41441cf30b