[automerger skipped] Merge "Update TCP buffer size for 5G data connections" into qt-qpr1-dev
am: e1fd5317 -s ours
am skip reason: change_id Id545e007b191e0b28aaa5c976484bb27259679fe with SHA1 8ca9cb3e is in history
Change-Id: I7229982546a19c111aed75bfd2c3c4099f3ea6d0