[automerger skipped] Merge "Add wipeOnError flag to NetworkStatsRecorder" am: 1934a82b52 -s ours am: e4ea6364de -s ours

am skip reason: Merged-In Id7a3d8bebf8a00d814f9e84bf4c10d927e6ff749 with SHA-1 692baa7d71 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2134272

Change-Id: Ibd3f3e3e3766d858fd6b6c7fd1742a46c7d78bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>