Merge changes from topic "stats-migration" am: bcdb3c12ee

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

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