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

Merge "Merge changes from topic "stats-migration" into tm-dev am: 23ed66f1 am: 4ce5244f" into tm-d1-dev-plus-aosp am: 30ca563b

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



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