Merge "Implement logging of upstream event type and duration." am: 9d6b724887 am: ef320a3892

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

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