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-polish
am: 0a6dde7265

Change-Id: I9a88426d472b117a300d2f543720b8e52b3e2ded