Merge "Send ConnDiags event before revalidating network in CS." am: ed2ccf0586 am: 078956721a am: d92c042e59

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

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