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

[automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cec -s ours am: 88e1f760 -s ours am: 98f62515 -s ours am: 6e4bd6d0 -s ours am: ac50dce2 -s ours am: 745b27e4 -s ours am: c4506552 -s ours

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

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



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