Merge "Fix edge case in statsd alarms" into rvc-dev am: ac2c18c314

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

Change-Id: Ib178e5d7f50152478543de24b29854b411567898