tree d03be1d0b9e7ab331810cc54be14cd2094920b1a
parent 71874fced7186fd5fd1a2dc1263d7207339d0673
parent b6b9322f01fce35bc76ffb90be20677e2b1375ba
author Treehugger Robot <treehugger-gerrit@google.com> 1625633533 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625633533 +0000

Merge "Fix flake in testConnectivityDiagnosticsCallbackOnConnectivityReported" am: 1d2ad89424 am: 5c7e4c179b am: 24713b1f4c am: b6b9322f01

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755630

Change-Id: I3e216c73424b5e9770f441b7a3e018cbbdafdeb1