Merge "Fix movement of RTC alarms with time changes" into qt-dev am: b3973b8787
am: 1e5fe9aa36

Change-Id: Ie53395ee3572e2d296db7e84a3b98981762b2fb2