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: I18f84a168d9d60810c6938e33ef55ca259bb3876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>