Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432

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

Change-Id: I18e5cc4fc8f5174682164911844d9d961948f937