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 sc-dev am: 8b2f5cec -s ours am: 4792391c -s ours am: b23fac67 -s ours am: d280e9bd -s ours am: f2b66565 -s ours" into tm-qpr-dev-plus-aosp am: da2ae6f8 -s ours

am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd5061 is already in history

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



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