[automerger skipped] Merge "Remove the usage of getMobileTcpTxPackets" am:...
[automerger skipped] Merge "Remove the usage of getMobileTcpTxPackets" am: fd3f2c74 am: 3ddcef97 -s ours
am skip reason: Change-Id I4b68a029b640dbb51269516711d8d6166989d5d7 with SHA-1 93fb71e6 is in history
Change-Id: Id847776f29a5b218fecb013d69fccbba664fc481