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

[automerger skipped] Merge "Add support for RAT-based TCP buffer sizes" am: 301fddda am: 50f6b213 am: 48948d58 -s ours am: 63847d56 -s ours

am skip reason: Merged-In I55ccb2a2f0b2408e97aa851b5a6e77cf2abac9f2 with SHA-1 bef8fde2 is already in history

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



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