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

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



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