Merge "Revert "Merge "Mark DismissTimerTest#testAll and SetAlarmTest#testAll as Suppress." am: 3a90adbb23 am: 2cf3cb08c8""