Merge "Increase timeout to expect CapabilitiesChanged callback" into main am: 889ca30e38

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

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