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

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



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