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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18457684



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