[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: e15951e5 -s ours

am skip reason: skipped by user suprabh

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



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