Merge "Fix calendar alarms not being triggered after 22h"
am: 3525221de1

Change-Id: I0c7dec74757a4f38aa82f774bc0d83beb30e23bc