[automerger skipped] Merge "Delete atoms.proto from statsd" am: b027f481 am:...

[automerger skipped] Merge "Delete atoms.proto from statsd" am: b027f481 am: 900be785 am: db5a1c06 -s ours

am skip reason: Change-Id I36ec354d273dceace5245d7634c68ac63dc5a8cd with SHA-1 4e671568 is in history

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

Change-Id: I7b2ae75d4edb6f724f1b90f11ef3af82ba47f4a9