Merge "Reset the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main am: eab653036d

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

Change-Id: Ia2b64271bae119abe30e6cec44a63b2c31f1de42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>