Merge "[CTT-6] Update TCP conntrack entry timeout while adding rules" am: db30678605

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

Change-Id: Ie5b26c90bc7e7677259ce1be85ce55002cf03d2e