Merge "Skip writing the metrics before T." am: 640c806e23

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

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