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

Change-Id: Ibdc7138881d6028ec1b914d6eee87ef4bcdb6c0e