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

Merge "[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a am: ee9331c0 -s ours am: ff26f6a3 -s ours am: c2841d8e -s ours am: 1479d4c5 -s ours am: b3f3961d -s ours am: 6a3dcb1f -s ours am: e15951e5 -s ours am: eb879704 -s ours" into tm-d1-dev-plus-aosp am: 547b36e4 -s ours am: 1b46382a -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/+/19105069



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