[automerger skipped] Merge "Fix edge case in statsd alarms" am: 246140a9 am:...

[automerger skipped] Merge "Fix edge case in statsd alarms" am: 246140a9 am: 1762dfed -s ours am: eb871dd0 -s ours am: 2c791097 -s ours am: 917707fb -s ours

am skip reason: Change-Id I150538cb1d3d5a2b943df2a32d92f8f84bb96626 with SHA-1 f5cd94b4 is in history

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

Change-Id: Ia69e2d5433ab85a02c9d824c2295ad878b599a89