Merge "[CTT-4] Improve conntrack timeout update logging" am: 8d2e46aec3

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

Change-Id: Ifdf2ef4dae1d295d9a27f04863efd136c4c5c808