Merge "Send ConnDiags event before revalidating network in CS." am: a4e39ee58a am: ad069383bd

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

Change-Id: Id42979bdb98469f586d97f05ed8ecdc28fbb878f
tree: 3669ffc7106b5dcfd8c64218b19282030378e2ec
  1. core/
  2. services/
  3. tests/