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

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

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