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

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

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