[automerger skipped] Merge "Migrate to packages/modules/StatsD/lib/*" am: b0509aa7 -s ours am: 4bff8a0b -s ours

am skip reason: Change-Id I22db7e344a9a96bfc16e009624b4896625306e83 with SHA-1 c30533a7 is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1523260

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57c843b9eacfd3454d9c64e108cb9f747ebf5061