[automerger skipped] Merge "Add new fields - |upstream_events| and |duration_millis| in stats.proto" am: a0824ead07 -s ours

am skip reason: Merged-In Id4d594f9238e18266dce5bf2ba238c1f86f655db with SHA-1 0debda22bf is already in history

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

Change-Id: I1cebb9a8d68cfa6399c9137d621b3aff65deb655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>