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

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

Change-Id: Ia336cfad4dfea2a283bfe8efffa6c0fc554190f2
tree: 8a2408ee136d3952c40c9a434c53107b116d316b
  1. bin/