[automerger skipped] Copy up/downstream bandwidth and TCP buffer sizes from...

[automerger skipped] Copy up/downstream bandwidth and TCP buffer sizes from underlying am: e237e35d am: 550bebcf -s ours am: 394302db -s ours

am skip reason: Merged-In I2d5dc5b9000fa9d0da9d34772b3704110694c526 with SHA-1 9d92b77a is already in history

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

Change-Id: I50af3917f1f3746171f881811a709d4337d6c5b1