[automerger skipped] Merge "Apply TcpBufferSize of CarrierConfig from...

[automerger skipped] Merge "Apply TcpBufferSize of CarrierConfig from ConnectingState" am: e9a8989e am: 1ad71669 am: 55bbf9eb -s ours

am skip reason: Merged-In I31c19b94029b0d9c82ad87225c0d3d318a93c701 with SHA-1 cdb37ffc is already in history

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



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