[automerger skipped] Merge "Revert^2 "Delete atoms.proto from statsd"" am:...

[automerger skipped] Merge "Revert^2 "Delete atoms.proto from statsd"" am: e72a1eb1 am: 919a826d am: 53d1dec5 -s ours

am skip reason: Change-Id I81a8287ed5b055e7b6547794d01e7ac897f0f022 with SHA-1 91224ea8 is in history

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

Change-Id: Icb39ff1d1c537b628bb9b119b8de3a27b00e9601