[automerger skipped] Merge "Add TCP info into DataStallEvent" into rvc-dev am: 7912eb5e -s ours
am skip reason: Change-Id I7509147793c202954c0a3c2c74aea9de4264ba37 with SHA-1 b3f9ff78 is in history
Change-Id: I8ac768ed61fdab97270b47b65e2aa8b951812118