Merge "Merge "Fix movement of RTC alarms with time changes" into qt-dev am:...
Merge "Merge "Fix movement of RTC alarms with time changes" into qt-dev am: b3973b87 am: aeedff3b" into qt-r1-dev-plus-aosp
am: c480b1bc
Change-Id: I91d8249708fd602054cd30e6c34c978bc183b898