Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432 am: 56ee46f814 am: a72829af90

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

Change-Id: Iaa3b58eb3ba6017f33f5a06a2392e7a119c33be2