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: I6cd757364628f1e1276e7110be711f19a2cb43ac