[automerger skipped] Merge "Fix edge case in statsd alarms" am: 246140a9 am: 1762dfed -s ours am: eb871dd0 -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: I4cc27440d1882df32a77582e8b8b8677b00bd558