Merge "Increase statsd guardrails for atoms and metrics" into main am: 9b6437d986

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/3023983

Change-Id: Idfddfb50a2b0dee4a5e3d34deb8de4cab6bfbe90
Signed-off-by: Automerger Merge Worker <[email protected]>