Merge "Add wipeOnError flag to NetworkStatsRecorder" am: 1934a82b52

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

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