Merge "Notify ClockChangedListeners on main thread"
am: e1b61141f9

Change-Id: I873723bc656c8a2199a015d8793f5673ce2911dc