Merge "Fix edge case in statsd alarms" into rvc-dev am: ac2c18c314 am: e2f6647e44 am: 5350160d2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004848 Change-Id: I87e9e549ed205c2783d0dd2e90b2b9edd83d8d32
This commit is contained in: