[automerger skipped] Merge "Migrate frameworks/base/cmds/statsd to...

[automerger skipped] Merge "Migrate frameworks/base/cmds/statsd to packages/modules/StatsD/bin" into mainline-prod am: 0ace541b -s ours

am skip reason: Change-Id I053f2a211ea28c2f181937af3d58ad16b235d096 with SHA-1 b74ba245 is in history

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

Change-Id: Iffcce9b8c610ba493b42e13a1db3629c84d6d058