[automerger skipped] Merge "RESTRICT AUTOMERGE Logging for alarms when they...

[automerger skipped] Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e5 am: 15a4a9ab am: 6a9b73f4 am: 941d3918 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I00deef662a053387ee078c7b6a308f9abf810312