Merge "ConnectivityDiagnosticsManagerTest: Raise timeout to 10s" am: e22bffecda

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

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