[automerger skipped] Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." am: bd021eb75e am: e42c0bbb01 am: 8d58f46d52 -s ours
am skip reason: Change-Id Icc6bcf7a2411133d8ecd7477bc351dad9333f24f with SHA-1 b8effbdfb8 is in history
Change-Id: If371a1a419404433930dbc732d4c84037b6fa0d5
This commit is contained in: