Merge "Skip writing the metrics before T." am: 640c806e23 am: 758f1d3761 am: 8e8aec8f1b

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

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