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: 904e5190 -s ours" into tm-d1-dev-plus-aosp