Merge "Merge changes from topic "stats-migration" into tm-dev am: 23ed66f1 am: 5c35103c" into tm-d1-dev-plus-aosp am: d583a9c9

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



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