[automerger skipped] Merge "Migrate apex/statsd -> packages/modules/StatsD/apex" into stage-aosp-master am: 8f2e0ec950 -s ours

am skip reason: Change-Id If4917e82f6dcc6e0f5606b0dfecabc7dbf72982d with SHA-1 59d91997fa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2dda2fa5d8528619a4b3a642312e15219eb94482