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

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

Change-Id: I326210549473dd30a1bc22f53bd0a050a72a30dd