Merge "Fix edge case in statsd alarms" am: 246140a9a3

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

Change-Id: Ie35e7c86667f4cdeeeb6cea0a45b1d7d75275909