[automerger skipped] Merge "Migrate apex/statsd -> packages/modules/StatsD/apex" am: a021ce9c2f -s ours am: 5d775cd034 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaedcd90d877529b37890470f01a0efad9253e2e6