Merge changes from topic "stats-migration" into tm-dev am: ac6213123a

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

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