[automerger skipped] Refresh conntrack entry timeout am: fadd7b7a33 -s ours
am skip reason: Merged-In Idbcf686c9b2124b192944156ac5111be741744fb with SHA-1 c27ec7c4a2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15114804
Change-Id: I86cd23cf49240ef231d08b80266773ad1ece00c7
This commit is contained in: