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 am: 53831f2b am: 87b6ac40 -s ours" into rvc-qpr-dev-plus-aosp am: e12b64b6 -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: I8d2bba745a14c88e68ce97d2d715bdae7a8c2e9e