Merge "Reduce flakiness in CtsAlarmManagerTestCases" into sc-dev