[automerger skipped] Merge "Add wipeOnError flag to NetworkStatsRecorder" am: 1934a82b52 am: 41c08d0b02 -s ours am: a0d82d0894 -s ours am: 2037fcc021 -s ours am: 872d153b5c -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: I7330f6e219e5046ace5a33e1c1254945427724c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>