Merge "Revert "Injecting handshake relevant statistics into statsd."" am:...

Merge "Revert "Injecting handshake relevant statistics into statsd."" am: 1d1c8a62 am: 4b9a9ef7 am: 403417d0 am: 9832f39f am: 4795e30c

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



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