Merge "Delete atoms.proto from statsd" am: b027f4818d am: 900be785eb

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

Change-Id: Ie0b00587a5368f7db2f73dbfa98dbedc43311a22