[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: e8ea59e2 am: a54f2e70 am: 678d411c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8f7fb90502998dec2f0a484f205196362b441cb8