[automerger skipped] Merge "Increase tcp polling interval on data stall...

[automerger skipped] Merge "Increase tcp polling interval on data stall detection" into rvc-dev am: e60d8975 am: 7c4dbc56 -s ours am: 7eee3151 -s ours am: 48486ca1 -s ours

am skip reason: Change-Id I496a32da8f57f88908402722ebe1cd3d0a8483b6 with SHA-1 1cde70c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11790988

Change-Id: I680a1fb520f840e8e5aea81f403c7164505f6493