Merge "Revert "Injecting handshake relevant statistics into statsd."" am: 1d1c8a62 am: 41969b95

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



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