Minimize chance of race condition bug that misses alarms by clearing/rescheduling alarms.

This was properly fixed in the provider but this tries to minimize the bug until that fix is rolled out everywhere.

Bug:7221716
Change-Id: I4cb32b48caf31c8372770b74d7983e54480b755a
3 files changed