Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e5

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

Change-Id: I3d5b6c4fa7227f6841b4d14ffc235451f00ff996