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

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



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