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

[automerger skipped] Merge "add TCP data stall metrics" into rvc-dev am: 92fbcb26 am: 114a7b64 -s ours

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11570799

Change-Id: I5e2bb86b8b6df445e0787ae00ef1a411870b05e3