[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours

am skip reason: skipped by user suprabh

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

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