Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432 am: 56ee46f814 am: 3d75600716 am: b2f8a7ac13 am: 4b408eee1b

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

Change-Id: Ic8f86d033548972b5cd413f3f24e8c3fb8df147c