Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847

Change-Id: I1562abb163e5ddf8a84bbac17d140d4fa1e54adf
tree: 33e394cf204a6126ecb3231f560188d48431550c
  1. core/
  2. services/
  3. tests/