Merge "Use correct flags on ACTION_TIME_CHANGED broadcast"