Merge "[automerger skipped] Merge "Send normal termination metrics on wifi...

Merge "[automerger skipped] Merge "Send normal termination metrics on wifi off" into rvc-dev am: 9e9451f3 -s ours am: 2a6dd04e -s ours" into rvc-d1-dev-plus-aosp am: 40cd5d01 -s ours am: ee697859 -s ours

am skip reason: Change-Id I9d086a199de0017aa425219d20882211423925e0 with SHA-1 750fe188 is in history

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

Change-Id: Ifec7967e9279e8df2054e8298c8343599012effd