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