Revert "Revert "Injecting handshake relevant statistics into statsd.""

This reverts commit 103bf63f.

Resolved merge conflict without any changes to the functionality.

Reason for revert: Mainline removes the MTS support for Q platform so it won't break MTS on Android Q devices.

Change-Id: I8f44fa31034087e02058857db8a8ebfe54febd03