[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: fb22c06e am: b90799e0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I14c26f1e40ccd51a0393e822e1e2003800ce0d9b