Merge changes from topic "am-e3cb07a527844fa6b5ffa85e184f8e56" into rvc-d1-dev-plus-aosp
* changes:
Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e5 am: e8ea59e2
RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec95616 am: 72fe499e