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

[automerger skipped] Merge "Migrate frameworks/base/cmds/statsd to packages/modules/StatsD/bin" am: cb00db1b am: 105f07b5 am: 2e53bb0b -s ours

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

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

Change-Id: I09f91bfcba7323301012bcf7b3b533816056c58b