Merge "Move ConnectivityDiagnosticsManagerTest to common" am: ef21082033 am: cb88733c59

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

Change-Id: I5a0959b0dacbed1662a7852ad8d191cfa57c57e4