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

Merge "Revert "Injecting handshake relevant statistics into statsd."" am: 1d1c8a62 am: 4b9a9ef7 am: 337758f2

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



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