[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 9e4a87ee75 -s ours
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 3d1df816d2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I0c408a703c9de759cf569b1e8cbeb749fbf906df
This commit is contained in: