[automerger skipped] Merge changes from topic "stats-migration" am: 29c927e4...

[automerger skipped] Merge changes from topic "stats-migration" am: 29c927e4 am: 4e6f1d87 -s ours am: efd8068b -s ours am: 69b6d3c7 -s ours am: 57dea20d -s ours

am skip reason: Merged-In I4177a8229cc9db18d76cb90c54a1b8d12ef8d98f with SHA-1 a9eceb80 is already in history

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



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