tree 3669ffc7106b5dcfd8c64218b19282030378e2ec
parent d67aa703dfbb78956d0a56b7b63c7ef263048c23
parent 76c6bc4a0dbf20df07459c938d03133631ecc8c8
author Lorenzo Colitti <lorenzo@google.com> 1593185621 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593185621 +0000

[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 am: 76c6bc4a0d -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: I55264ab00ba7646dde9e6c7b9a600258b8b992e2