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

[automerger skipped] Merge "Used single TCP configuration for devices" am: 71649aa3 am: 5c11d472 am: d80c079b -s ours am: 8cf7c034 -s ours

am skip reason: Merged-In I1f19e1217f7e7da37b3dd3b511d4859d77ec7bad with SHA-1 ee410d34 is already in history

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

Change-Id: Ieb794d0d939df1c147c7c2f3760822a89ac1671d