Merge "[CTT-5] Stop update TCP conntrack entry timeout" am: 69ccea4839

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760691

Change-Id: Ib1e1c1f2ccdf85bd3a7fd2275abb7ee144207b58