[automerger skipped] Merge "Delay global alerts by 1s for high thresholds" into pi-dev am: 688358e870  -s ours
am: 4e6f39894b  -s ours

Change-Id: I8343d023ec9584b2a592114e51d588a4c67d83e9