[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: 650e883f -s ours am: 1217209e -s ours am: a001487a -s ours

am skip reason: skipped by user suprabh

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



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