[automerger skipped] Merge "Migrate apex/statsd -> packages/modules/StatsD/apex" am: a021ce9c2f -s ours am: 5d775cd034 -s ours am: 990ee68789 -s ours
am skip reason: Change-Id Ifee35a00de64e194abb80af5d85e34732244f509 with SHA-1 3001a82d2c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518642
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I18f3749c9b6e2223acb04a8edc1386a294e859bb
This commit is contained in: