Merge "Injecting handshake relevant statistics into statsd." am: 80742f41...

Merge "Injecting handshake relevant statistics into statsd." am: 80742f41 am: 8c4ae1c4 am: 9303e427 am: 00bc3951

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



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