Merge "Refresh conntrack entry timeout" am: a569410667

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

Change-Id: I13894c11c848b85d4647ffecb359420421839896