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

[automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2 -s ours am: 60276bee -s ours

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

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



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