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