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

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

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



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