Revert "[CTT-6] Update TCP conntrack entry timeout while adding rules"

This reverts commit 299a81157c257a6b6bc9d41aef094fdfe8aadde7.

Reason for revert:
Stop releasing this commit because it needs more test coverage.

Bug: 190783768
Bug: 192804833
Change-Id: I6a0d93e04814ae73e1ec7d6fd4df19e1d2787207
Test: atest TetheringCoverageTests
4 files changed