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

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

Change-Id: I87fa2070b49247a8378c82325b67bf8c30b365bb