Merge "Revert^2 "Delete atoms.proto from statsd"" am: e72a1eb1eb

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

Change-Id: I2a9ff1e9a4eb1022a25b5a959a68f0f28ecf770f