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

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

Change-Id: I8ed2ab1fdad5a393eadf610633bff57bcfaadc76