Merge "Report discovery metrics data" into main am: 238efa1070

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

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