Merge "Bug fix in Alarm where it was not getting called correctly if the new timeout was set that was smaller than the previously set timeout" into ub-launcher3-calgary
am: dbbb1fee90

Change-Id: If5d392fb037a57669407c16d428ef12cdd52377a