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

Change-Id: I4c8ea5e4b5659cf5ec3aa51dc863baa373a5040c