[automerger skipped] Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." am: dd237cfd2d am: db42dddf96 am: d36a0b81d4 -s ours
am skip reason: Change-Id Icc6bcf7a2411133d8ecd7477bc351dad9333f24f with SHA-1 1e5ab9bb5b is in history

Change-Id: If371a1a419404433930dbc732d4c84037b6fa0d5