[automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 4792391ce3 -s ours am: b23fac6739 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495
Change-Id: I9261fbf3a8bc6aed41d176834bbf61d8bac1ca4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: