Merge "Revert "Delete atoms.proto from statsd"" am: 3f89c81e39

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

Change-Id: Ic4b5b3423375efe5bb5a40eb18d80a555e719e95