[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 -s ours am: 76f71fa3 -s ours am: 5c0135a2 -s ours

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

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

Change-Id: I7adba4d7fc79ba437a59aa1270e569fee46090ea