Merge "[automerger skipped] Merge "add TCP data stall metrics" into rvc-dev...

Merge "[automerger skipped] Merge "add TCP data stall metrics" into rvc-dev am: 92fbcb26 -s ours am: e358e78a -s ours" into rvc-d1-dev-plus-aosp am: 25bc865b -s ours am: 8c6893e0 -s ours

am skip reason: Change-Id I5e306299f3cf4f49c46f161cd0aa4cb40d1ab76e with SHA-1 0b34ae62 is in history

Change-Id: I5674d5691fa5bd59c5220e517f58a168fe1f6591