Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." am: dd237cfd2d

Change-Id: I60d418afb145238981c17cc9a29ff57dc42c1ff0