[automerger skipped] Do not mock shim in TcpSocketTrackerTest am: 9eb5c2c3...
[automerger skipped] Do not mock shim in TcpSocketTrackerTest am: 9eb5c2c3 am: 3964132b am: b7becb67 -s ours
am skip reason: Change-Id I580ae9ded468d3f08da336b160596484938bf2a5 with SHA-1 9eb5c2c3 is in history
Change-Id: Ia6e2c2ba5624cb99ab08684b1f37f9b94c884267