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
am: d82f688b9f

Change-Id: Iff5261899f13d8023c722b100501dd0ebe0f3fcc