[automerger skipped] Merge "Used single TCP configuration for devices" am:...

[automerger skipped] Merge "Used single TCP configuration for devices" am: 268512db am: 1c6b6292 am: 7b32910a -s ours am: f06705f9 -s ours am: 395617a8 -s ours

am skip reason: Merged-In Ic529f184359fcf6623b85ce78527ddc94cdf7c1b with SHA-1 ebdd05f2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2022619

Change-Id: I955902e76e8e095e6d11dcecc6724695c360f38d