tree 3669ffc7106b5dcfd8c64218b19282030378e2ec
parent 2323163720ee7ac84b11fe6c7fdd1c320c27b409
parent aace2f48a9e908f0be4aa83273046c7fd0eae1f6
author Lorenzo Colitti <lorenzo@google.com> 1593184884 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593184884 +0000

[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours

am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 b0174784bc is in history

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

Change-Id: I5d9f3dfaf49f78773c92f4c6dfefb95adb629ce8