Merge "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main am: 3049df0ee0

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

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