[automerger skipped] Merge "Migrate apex/statsd -> packages/modules/StatsD/apex" into mainline-prod am: 1494354af4 -s ours

am skip reason: Change-Id Ifee35a00de64e194abb80af5d85e34732244f509 with SHA-1 3001a82d2c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2f569c455f133e5bd1b984c9efc6ee69e7f8b8f