Merge "[automerger skipped] Merge "Stop crashing the system on hitting the...

Merge "[automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into tm-dev am: 8afb230a am: 992a1b29 -s ours" into tm-d1-dev-plus-aosp am: 4ae2f0f5 -s ours am: 7c6bf4e5 -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/+/19122700



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