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 am: 797bcc34 am: 4cd3ca71 -s ours" into rvc-qpr-dev-plus-aosp am: cd81bebd -s ours

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

Change-Id: Idc0a21bf97be2b3e35374ff2a5d743500fece780