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: Ic8527bf901cb2a2ade80a623a363a27644ac5d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>