Merge "Notify ClockChangedListeners on main thread" am: e1b61141f9 am: 280826c3c1

Change-Id: I79165fd7192befd5a7b263529740ff20ca03f01c