[automerger skipped] [automerge] Stop crashing the system on hitting the alarm...

[automerger skipped] [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd5061 am: b7d6952d -s ours am: 2dac8d1d -s ours

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

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



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