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

[automerger skipped] Merge "Send normal termination metrics on wifi off" into rvc-dev am: 9e9451f3 am: 53831f2b -s ours am: 872426f8 -s ours

am skip reason: Change-Id I9d086a199de0017aa425219d20882211423925e0 with SHA-1 2a8c3f96 is in history

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

Change-Id: I8f812577c21863ccbdc95cbc2181a494b792f5ca