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

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

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