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: cc77f683

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



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