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

Merge "Fix edge case in statsd alarms" into rvc-dev am: ac2c18c3 am: e2f6647e am: d144ff24 am: 514f6225

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

Change-Id: Iac720af44da9612e5b70ed50a7403d14103ff9b9