[automerger skipped] Merge "Stop crashing the system on hitting the alarm...

[automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e -s ours am: 566f6946 -s ours am: 0ded155f -s ours am: ef65df92 -s ours

am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a is already in history

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



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