[automerger skipped] Stop crashing the system on hitting the alarm limit am:...

[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a am: ee9331c0 -s ours am: ff26f6a3 -s ours am: c2841d8e -s ours am: 1479d4c5 -s ours am: b3f3961d -s ours am: 6a3dcb1f -s ours

am skip reason: skipped by user suprabh

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



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