Merge "Stop crashing the system on hitting the alarm limit" into tm-dev am:...

Merge "Stop crashing the system on hitting the alarm limit" into tm-dev am: 8afb230a am: 992a1b29

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



Change-Id: Id7d1ac13abe6fc306a6e23bf6708834baf370e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>