[automerger skipped] Merge "Add support for RAT-based TCP buffer sizes" am:...

[automerger skipped] Merge "Add support for RAT-based TCP buffer sizes" am: 3a12f6bd am: 225e8956 am: b5e6f082 -s ours am: 74479a35 -s ours

am skip reason: Merged-In I1418518289a0d37c33dbadfbd9561df710e67105 with SHA-1 8092933a is already in history

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



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