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

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

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



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