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

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

Change-Id: Ic3b2db632a68af6d8dd613823a4fe7044c38317d